verbose-tests

Enable verbose tests and print content of failing tests output file.

Gbp-Pq: Topic debian
Gbp-Pq: Name verbose-tests.patch

diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index 31cf70f42d27513b54863c8ff79933424aadcead..40016721a8298f73075a9d303cc604656ff8858c 100644 (file)
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -13,7 +13,7 @@ clean-local-tests:
 
 CLEAN_LOCALS += clean-local-tests
 
-TESTS_OPTIONS = --nonroot
+TESTS_OPTIONS = --nonroot --verbose --parallel=1
 TESTS_PARALLEL = --parallel
 TESTS_COMMAND = $(top_srcdir)/tests/run.sh \
        --srcdir=$(abs_top_srcdir) \

diff --git a/tests/functions.sh b/tests/functions.sh
index 561412212066942461bf57a2efe3bcc6ef0e11f4..56b55a2abacaaa2aa238d0139e615d240b7f623f 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -148,6 +148,17 @@ function ts_failed_subtest {
                ts_report " $msg ($1)"
        fi
 
+       if [ "$TS_VERBOSE" = "yes" ]; then
+               echo ========= script: $TS_SCRIPT =================
+               echo ================= OUTPUT =====================
+               cat -n $TS_OUTPUT
+               echo ================= EXPECTED ===================
+               cat -n $TS_EXPECTED
+               echo ================= O/E diff ===================
+               diff -u $TS_OUTPUT $TS_EXPECTED
+               echo ==============================================
+       fi
+
        return $ret
 }